bitkeeper revision 1.1480 (428d419a4_wx5uoCl1gCLjxUtYhqRA)

Fix Linux 2.4 domU build
Signed-off-by: ian@xensource.com

diff --git a/linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile b/linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile
index b17b430bf31a0ccaebe7d513fb43835453232238..3eb0701958535dabf7d1311fb7069f9b66f3bf11 100644 (file)
--- a/linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile
+++ b/linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile
@@ -6,12 +6,12 @@ all: kernel.o head.o init_task.o
 
 O_TARGET := kernel.o
 
-export-objs     := i386_ksyms.o skbuff.o ctrl_if.o
+export-objs     := i386_ksyms.o gnttab.o skbuff.o ctrl_if.o
 
 obj-y  := process.o semaphore.o signal.o entry.o traps.o irq.o  \
                ptrace.o ioport.o ldt.o setup.o time.o sys_i386.o \
                i386_ksyms.o i387.o evtchn.o ctrl_if.o pci-dma.o \
-               reboot.o fixup.o skbuff.o
+               reboot.o fixup.o gnttab.o skbuff.o
 
 ifdef CONFIG_PCI
 obj-y  += pci-i386.o pci-pc.o

diff --git a/linux-2.4.29-xen-sparse/mkbuildtree b/linux-2.4.29-xen-sparse/mkbuildtree
index da059ad6cf2941cdb4ea93cde8facda3169030ed..714d85e69f99ef03fc8682fdd18f3cf1a43452e2 100755 (executable)
--- a/linux-2.4.29-xen-sparse/mkbuildtree
+++ b/linux-2.4.29-xen-sparse/mkbuildtree
@@ -208,6 +208,7 @@ ln -sf ../asm-i386/vm86.h
 ln -sf ../../${LINUX_26}/include/asm-xen/balloon.h
 ln -sf ../../${LINUX_26}/include/asm-xen/ctrl_if.h
 ln -sf ../../${LINUX_26}/include/asm-xen/evtchn.h
+ln -sf ../../${LINUX_26}/include/asm-xen/gnttab.h
 ln -sf ../../${LINUX_26}/include/asm-xen/hypervisor.h
 ln -sf ../../${LINUX_26}/include/asm-xen/xen_proc.h
 ln -sf ../../${LINUX_26}/include/asm-xen/asm-i386/synch_bitops.h
@@ -228,6 +229,7 @@ ln -sf ../../i386/kernel/sys_i386.c
 ln -sf ../../../${LINUX_26}/arch/xen/kernel/ctrl_if.c
 ln -sf ../../../${LINUX_26}/arch/xen/kernel/evtchn.c
 ln -sf ../../../${LINUX_26}/arch/xen/kernel/fixup.c
+ln -sf ../../../${LINUX_26}/arch/xen/kernel/gnttab.c
 ln -sf ../../../${LINUX_26}/arch/xen/kernel/reboot.c
 ln -sf ../../../${LINUX_26}/arch/xen/kernel/skbuff.c